Remove conflict markers

diff --git a/ChangeLog b/ChangeLog
index a867a8f75d6e2127f8dbdff9917a5c433713a566..95ca30919f8c02f39cc1f56ba8408d8deffdf4bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -136,7 +136,6 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
->>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a867a8f75d6e2127f8dbdff9917a5c433713a566..95ca30919f8c02f39cc1f56ba8408d8deffdf4bb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -136,7 +136,6 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
->>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a867a8f75d6e2127f8dbdff9917a5c433713a566..95ca30919f8c02f39cc1f56ba8408d8deffdf4bb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -136,7 +136,6 @@
        Enter the "user-resized" state of the column only if a drag
        actually changes the column width, not on any click.
 
->>>>>>> 1.6531
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenu.c (gtk_menu_paint): Allow setting background